Merge "Fix null-pointer in EnableZenModeDialog" into rvc-dev am: 707032d7eb am: 99d57c0ad3 am: bc461464d3
Change-Id: I92b9b6f593726c1edeb1f731febdbdbde07756f6
This commit is contained in: