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