Merge "Corrected flow for accessibility." into qt-dev
am: 872dc6b4bd

Change-Id: I9f7708a9741af1e943a1cc35eaef5d0f426503fc