Merge "Fix navigation to mini drawer" into ub-gmail-ur14-dev