Merge "Inflate and strip remote views for pre-N apps." into nyc-dev