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

Change-Id: I7c4f663a526ae16143e9e305f29600f70d186f82