Merge "Show "Done" button to prevent user from getting stuck"