Technical enhancements for Android Q