Merge "QCamera2: add avtimer debug property" into nyc-mr1-dev