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

Change-Id: I476c6bce6daf352dfa1a6741345f642b3472fed1