Merge "Remove bouncer root view whenever it is not needed." into main