Merge "Fix Android/media detection bug" into sc-mainline-prod