Merge "Deprecate MANAGE_ACTIVITY_STACKS permission"