Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd