Promotion of android_ui.lnx.2.1-00004.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1057971   Ibc69a8d176ddfee67b4ae9b48787ec87aeb8581b   Settings: Selections of Home app are lost
997931   Ibb80001a1d461ade86cc001bf67c8b6b6b4dede4   Hide ims apns for operator

Change-Id: Iab7adece04cb0a795db585c7ed1b56b13d1fe15d
CRs-Fixed: 997931, 1057971