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