Merge "Fix crash when returning to apps permissions page" into sc-dev