Merge "Made sure that the ambient single line view remains invisible" into pi-dev am: 75402c371b
am: f15f5047fa

Change-Id: Ida6a68b2bd2775e174f591229dab940a6349fd44