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