Merge "Fix initial notification icon visibility" into rvc-dev am: 768171da am: baad0c14 am: fe005795 am: 8313df0d Change-Id: Id568cd194dac26583623ab4ea9799a9cf97ecd06