Merge "Remove PRIVATE_FLAG_IS_SCREEN_DECOR"