Merge "Fix close and back buttons in caption proto 1." into tm-qpr-dev