Merge "Move assist handles from ScreenDecorations to navigation bar"