Merge "overlay: change a few settings options" into android-10