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