Merge "Misc fixes for User page and my device info page"