Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev