Merge "Fixed that views could be stuck transiently at times" into pi-dev
am: f81ad4b94c

Change-Id: I066038b167f71f4f649b609b68aec66891c97a24