Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev