Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev