Merge remote-tracking branch 'origin/caf/caf/android_ui.lnx.2.0.1-rel-base' into android_ui.lnx.2.0.1-rel