Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev
am: ca0ef33746

Change-Id: Id68955fa3127668b3403bb946ecb850f8e7a3d55