am be20490b: am 0008ff9b: am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen

* commit 'be20490b25011fe730824412ab674c447d26ffbe':