Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5
am: 01a0945e36
Change-Id: Ib58a689a6d7dfbee62663729ddefa29eb9423f9e
This commit is contained in:
21338186d5
am: 01a0945e36
Change-Id: Ib58a689a6d7dfbee62663729ddefa29eb9423f9e