Cherry picked without development's navigation

Cherry picked without development's navigation bar.