Merge "Cleanup usages of MANAGE_ACTIVITY_STACKS permission"