Merge "Made sure that the ambient single line view remains invisible" into pi-dev