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

Change-Id: Id568cd194dac26583623ab4ea9799a9cf97ecd06