Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5
am: f3aa88ccf2
am: e7e184fdc8
am: 285ef8c7de
am: dbbaabc17b
Change-Id: Ibc2917de83662e4e2672f7e087c62620a480268a
This commit is contained in: