Merge "Add selectors for drawer item state change" into jb-ub-mail-ur9