Merge "navigationbar - fixed a to_content_pop API logic error."