Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev