Merge "Minor updates to fix drawer operation." into oc-dev