Merge "Don't trigger strict mode for shortcut manager bitmap compression"