Merge "Rename public constant to EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED" into sc-dev