Merge "Some fixes for docking from navigation bar use case"