[merge] fixes and improvements from msm.android.app  repo