Merge "Clear Accessibility Focus from icon after Shorcut Menu invoked" into tm-qpr-dev