am d947d472: (-s ours) am a4909cba: Hide the custom view when we get onPause() DO NOT MERGE

* commit 'd947d472aeb93ee925fada7732f7cde8f0b7c1bc':
  Hide the custom view when we get onPause() DO NOT MERGE