Merge "AOD: Enable double tap in AOD"