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

Change-Id: Ib7f69a0dafe92592a623970aeb72b54ff2826e63