Merge "Fix initial notification icon visibility" into rvc-dev am: 768171dade am: baad0c1404 am: fe00579536

Change-Id: I214323cfc26862ba7003fcf284f7cf22c24495ed