Adjustments fpr Android 15
