Merge "Protect popFromBackStack with SDK_INT check." into lmp-mr1-ub-dev